From 0a206df7e97269750f21a266417e5c96329576aa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 28 Feb 2005 04:33:42 +0000 Subject: [PATCH] Fix a typo. (#168646, Vincent Untz) 2005-02-27 Matthias Clasen * gtk/gtklabel.c (gtk_label_size_request): Fix a typo. (#168646, Vincent Untz) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtklabel.c | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f6aebe1fd4..f35e58f00a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-02-27 Matthias Clasen + * gtk/gtklabel.c (gtk_label_size_request): Fix a typo. + (#168646, Vincent Untz) + * gtk/gtkfilechooserdefault.c (save_folder_combo_create): Unset "focus-on-click" for the save folder combo. (#168688, Sven Neumann) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f6aebe1fd4..f35e58f00a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-02-27 Matthias Clasen + * gtk/gtklabel.c (gtk_label_size_request): Fix a typo. + (#168646, Vincent Untz) + * gtk/gtkfilechooserdefault.c (save_folder_combo_create): Unset "focus-on-click" for the save folder combo. (#168688, Sven Neumann) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f6aebe1fd4..f35e58f00a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-02-27 Matthias Clasen + * gtk/gtklabel.c (gtk_label_size_request): Fix a typo. + (#168646, Vincent Untz) + * gtk/gtkfilechooserdefault.c (save_folder_combo_create): Unset "focus-on-click" for the save folder combo. (#168688, Sven Neumann) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index f1d2cee47a..b0a895d639 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2018,7 +2018,7 @@ gtk_label_size_request (GtkWidget *widget, priv->width_chars > 0 || priv->max_width_chars > 0) && aux_info && aux_info->width > 0) width += aux_info->width; - else if (label->ellipsize || priv->width_chars > 0 || priv->width_chars > 0) + else if (label->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0) { PangoContext *context; PangoFontMetrics *metrics; -- 2.30.2